diff --git a/templates/base.html b/templates/base.html
index 59047c9..1830a68 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -63,6 +63,12 @@
       <p>
         {% block header %}
         <a href="{{ SITEURL }}">Index</a> &#124; <a href="{{ SITEURL }}/archives.html">Archives</a> &#124; <a href="{{ SITEURL }}/categories.html">Categories</a>
+        {% if FEED_ALL_ATOM %}
+        &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
+        {% endif %}
+        {% if FEED_ALL_RSS %}
+        &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
+        {% endif %}
         {% endblock header %}
       </p>
     </header>
diff --git a/templates/category.html b/templates/category.html
index fbaae06..b82a7d4 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -10,4 +10,10 @@
 {% endblock %}
 {% block header %}
 Category: {{ category }}
+{% if CATEGORY_FEED_ATOM %}
+&#124; <a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}">Atom Feed</a>
+{% endif %}
+{% if CATEGORY_FEED_RSS %}
+&#124; <a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}">RSS Feed</a>
+{% endif %}
 {% endblock %}
diff --git a/templates/tag.html b/templates/tag.html
index fa312e6..004be31 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -10,4 +10,10 @@
 {% endblock %}
 {% block header %}
 Tag: {{ tag }}
+{% if TAG_FEED_ATOM %}
+&#124; <a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}">Atom Feed</a>
+{% endif %}
+{% if TAG_FEED_RSS %}
+&#124; <a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}">RSS Feed</a>
+{% endif %}
 {% endblock %}